bitkeeper revision 1.559.1.2 (3fa8e59fjgu1Rm3Cu-9n7CbSrKjgAg)
authorsmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 5 Nov 2003 11:57:19 +0000 (11:57 +0000)
committersmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 5 Nov 2003 11:57:19 +0000 (11:57 +0000)
commit5929aa5781535119b4b7521ec3549dd42403cb86
tree67113a49c20ef7f2124f7e1918a2294c48c1019c
parentfa47669f484c52417c5758c71de833227b3a386c
bitkeeper revision 1.559.1.2 (3fa8e59fjgu1Rm3Cu-9n7CbSrKjgAg)

manual merge
xen/drivers/block/xen_block.c
xen/include/hypervisor-ifs/vbd.h